projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d89aee 35db9d7)
bitkeeper revision 1.1519 (42925a7e5ZIo431XTUQd8kj6omAbZA)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 23 May 2005 22:34:38 +0000 (22:34 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Mon, 23 May 2005 22:34:38 +0000 (22:34 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
BitKeeper/etc/ignore patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc BitKeeper/etc/ignore
index ad45f21a5fd42cfa9e26d27d9ea24e158f3bfd4e,8ffdcf5028995df6c36003492533c412a6f32d0c..a48ab6cff972a269d405e5cbb4e72549db71f326
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -10,6 -10,6 +10,7 @@@
  *~
  BLOG
  BitKeeper/*/*
++Makefile.rej
  PENDING/*
  TAGS
  Twisted-1.3.0.tar.gz
Unnamed repository; edit this file 'description' to name the repository.